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

Bug: 134605042
Change-Id: I97cee1c3de845bf7a5160c35f4d5381b8fecb8fb