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

Bug: 124234733
Change-Id: I3266d6ee1b59a6155c77e15a712deee904c227fe