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

Bug: 132622481
Change-Id: I64de94291e8fb8ac0e0b574594c3923aeb97d21d