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

Bug: 132622481
Change-Id: Ia33774478abf9699ccc6f4a391b6beb0028397ac