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

Bug: 132622481
Change-Id: I56ee93c8603621f0ff2f184dbda22d103445eb22