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

Bug: 132622481
Change-Id: Ica460d164a4c5c8852c7c952eaf13d06de761e56