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

Bug: 134605042
Change-Id: Ifb8de28ea860cec31308c8472c26766a6461aa5d