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

Bug: 132622481
Change-Id: I4f9752884d4432c115226087fc7ea5f3034aff5b