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

Bug: 124234733
Change-Id: I390b8d0f71cea3b74ff9e6e6cb7b9156f6072b0b