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

Bug: 132622481
Change-Id: Iae0d7cd9c5ebd11b970d9ea131b6ff23fccbb129