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

Bug: 132622481
Change-Id: I480712de316ab28f8bc17f2f42e916e7e7285bc3