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

Bug: 136196576
Change-Id: I73dc846033ee0fdf7266ed3bdd71a87f6863b427