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

Bug: 136196576
Change-Id: Ief8d436837dcffaead17ae754839a7c595bfab40