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

Bug: 132622481
Change-Id: Ia527af35ba815af229ba154d18ec2cbee8f5e7a1