DO NOT MERGE - Merge pie-platform-release (PPRL.190505.001) into master.

Bug: 132622481
Change-Id: I9521ad8c3f1b9df8328e8ef32c4e5ff2033eed74