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

Bug: 136196576
Change-Id: Id3d0f68ba1141e89488c0c8fb662668c43eeec9a