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

Bug: 134605042
Change-Id: Ife6e13bfe9017388e48143e2f6475111d5bebca3