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

Bug: 136196576
Change-Id: Ie57d208a8adf88a9c2e7396291918d5f6688118e