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

Bug: 132622481
Change-Id: I40be005882cd1d7d4930e766707b44b9f55ce33d