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

Bug: 132622481
Change-Id: Ifd9c64ef9eaaf942a5556037c751090c406e05d7