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

Bug: 132622481
Change-Id: I32dc9faf804cc2bbcf2d67af0e9c5a2415112fff