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

Bug: 136196576
Change-Id: Ie49e1d61ae30cd4190ed53d0ef1471e6c23588b1