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

Bug: 132622481
Change-Id: I1a70e89ac22f9a10d59c7b3d7fa141949e615540