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

Bug: 132622481
Change-Id: I7fef6c6336d5551afbf14528b4dfbb5621ce7041