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

Bug: 132622481
Change-Id: I8a8e873f02e9dafc741d789d64020e32c7f08468