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

Bug: 136196576
Change-Id: I56982f3e2f123684c2ba748da659c056f567ecb0