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

Bug: 124234733
Change-Id: Ie8a6a0a0139e4a6821288af1aa4d0a9d4b277143