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

Bug: 136196576
Change-Id: I1087539ffb3528d9c743845198fc99c7f07790c0