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

Bug: 134605042
Change-Id: Ic8e7567e6a8bb98bea71d9063c197ecdedc0a9ea