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

Bug: 132622481
Change-Id: I5709aae995f60e8f69d473c5e7e17bf5cd86c1d3