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

Bug: 134605042
Change-Id: I5a337edc2634ba6e2ff58ac2e563ca1f4ab2e786