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

Bug: 132622481
Change-Id: I7ad24a94a3b95b265306b28e00480548ce9c12d6