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

Bug: 132622481
Change-Id: I744d4c2e70ac0685dcbcad8ff8e1a10f8f6b596d