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

Bug: 132622481
Change-Id: I812914052b50070b44ac2e2ba573a7146b6cbb78