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

Bug: 132622481
Change-Id: I738ebbd9dad9f16451a2c77a847caa1b2941d91b