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

Bug: 136196576
Change-Id: Iabd1c5655b5b7941f27503538880db9c380c1421