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

Bug: 132622481
Change-Id: If0cd8b93abc7a5536e0a8121c7710bb9886b3594