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

Bug: 136196576
Change-Id: Id1667c08d51f9bc0e8095f97944e35c8082e9bec