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

Bug: 136196576
Change-Id: I92325f11cd21ad84390df457d8b7da6796bf75ca