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

Bug: 124234733
Change-Id: I92417f0e4409ddbc3fbb2f2d35edd535e59fdb5a