DO NOT MERGE - Merge pie-platform-release (PPRL.190605.003) into master

Bug: 134605042
Change-Id: I6f63d7f9e5673f40f367c08fe74128f5391731a5