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

Bug: 124234733
Change-Id: I961343ca4f8b16a49bb7bb4b16dceff17278a293