DO NOT MERGE - Merge pi-platform-release (PPRL.190505.001) into stage-aosp-master

Bug: 132622481
Change-Id: I4194afa6c6505e676ddb8f5107d03300a805d9ab