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

Bug: 132622481
Change-Id: Ie28cb04593dbfdb7827efd61dee0dd53773750fb