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

Bug: 136196576
Change-Id: I77c591fd4d7f2774c864c1dfd1529b5d1265a86d