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

Bug: 124234733
Change-Id: I0d1f506ed30baff926c0dd0c3a7e1e30b7b710af