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

Bug: 136196576
Change-Id: I3270b56c07daf47723181239b981a78d8f2b9814