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

Bug: 134605042
Change-Id: I88d4adc5690f99ac5e7fda87f0ea7ca13be29e8e