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

Bug: 136196576
Change-Id: Ia86e0e391932fad40814b718bca8c39b02477f8a