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

Bug: 134605042
Change-Id: Iaf96194ef53bc6806e0cecb756334618e82d46bd