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

Bug: 132622481
Change-Id: I2fed1e56d75c913d2d9190d8daf6cf80d982eb64