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

Bug: 136196576
Change-Id: I86e00cb2e8b18fda973cc4f70d02f8bc753ce318