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

Bug: 132622481
Change-Id: I396a6d1d8f47348932b1a15790c98eb1f5913dbe