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

Bug: 132622481
Change-Id: Ifc3bab87f3209a5752ad4913287b599a7dde8b0c