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

Bug: 132622481
Change-Id: I518635186846d12a3c82ca6dd6e86ba84d213d56