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

Bug: 132622481
Change-Id: Ie2af73fae9852849b11796bb1e77f0fc62c28ce2