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

Bug: 124234733
Change-Id: I0492dd77f753eeb97a6a912476fe2195363bcdf6