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

Bug: 136196576
Change-Id: Ibc93f4481fa05c2b567aa5566390e965852c7615