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

Bug: 136196576
Change-Id: I0b0162857a7b81f93c24a28a2e636bc19a20d3b1