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

Bug: 132622481
Change-Id: Ic1c89ffa30bf69b100bca982e37c4cafc48ee524