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

Bug: 136196576
Change-Id: I63f1465fcd85a1cd09d850bd7882b950cee2012b