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

Bug: 136196576
Change-Id: I199cc6ec646571d081338a92ba9c9ad2c8c04b42