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

Bug: 136196576
Change-Id: I8b970a9a7dc97d84af82321329fbf82064b50eb6