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

Bug: 136196576
Change-Id: Ia8aea5133230c26c68b2978d26a3fb60cb4aa272