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

Bug: 132622481
Change-Id: I3d6153385cd83d3d0feb118ce7cb2e4df6dc3d0c