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

Bug: 124234733
Change-Id: Ia72f271ae01966c235400ed9d582bf6d7d31a1dd