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

Bug: 134605042
Change-Id: Ib4761e650a2293cca50171b63e07456c06fa04dd