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

Bug: 134605042
Change-Id: I6e84aff598c148c7ff69b1f421d1ba802ae94289