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

Bug: 136196576
Change-Id: Ieba3b884704b7097cabbe5f385ceb40c15e6230d