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

Bug: 132622481
Change-Id: Ie4daa78d0eec4757efd688870316c29d97f12d75