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

Bug: 124234733
Change-Id: I663abc6dedaa2080a561bf619b2dfb15a50f02f2