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

Bug: 124234733
Change-Id: I77e87e7181d3d0aa9d91f325147a48566c415db5