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

Bug: 132622481
Change-Id: I7ba1a9999b3a9bac8031dd086fa2632e45404f32