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

Bug: 132622481
Change-Id: Ieb43d6aa24cc1afe6e746a035c1d38fecd964192