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

Bug: 124234733
Change-Id: I570a4efdaf02c52d6b9117cbf51f88451bb7e610