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

Bug: 132622481
Change-Id: I6826b15380b6d4b3692c5e62fee67378f3b6252c