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

Bug: 132622481
Change-Id: Ifffb4ff1d7c84e8288fcb11be490add07c6ccd6f