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

Bug: 132622481
Change-Id: Iddcaf689a804e11259fd5cc0e8de56701f0f658f