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

Bug: 132622481
Change-Id: I60b4f6474c665bc04fea1d37b32b73b1d99ac756