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

Bug: 124234733
Change-Id: Iff213d95a3da69f58cd95afd129323ad7613c8e4