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

Bug: 124234733
Change-Id: Ic48a34d14efadeb5819637a547d0ea45cfb05b16