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

Bug: 132622481
Change-Id: Icbbe819390f2495141a11bb7f1710725d6fcac03