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

Bug: 124234733
Change-Id: Ie9a5ad41beffb1d6734e516789973b442dce6d87