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

Bug: 132622481
Change-Id: Iaee0bd41f640b57a58560c01708ba6ce327b46bb