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

Bug: 136196576
Change-Id: If37f1fc8b9471eb29cbad91052b30e64629d6ca8