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

Bug: 124234733
Change-Id: Ib6e64738e3b24bb40a7f4e76b0b5f48da485e7c4