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

Bug: 136196576
Change-Id: I6ef5b443f6341944863bcfe3d50cf8b5ae5f01ab