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

Bug: 132622481
Change-Id: Ifcb8d7b6ea6fa3fb255527629c9642587f3b3a12