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

Bug: 136196576
Change-Id: Ice8d2c4a18b882d55ffa942c7ccb33e49d30d855