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

Bug: 132622481
Change-Id: I79f6edcc34513cad15498d5419fd2e2820c73b98