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

Bug: 136196576
Change-Id: Id7ceb0fa52286d2e52e772f7f8ecaf8d8a9dd383