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

Bug: 136196576
Change-Id: I616a4894816928fd100a50d02e8c122d15ee911a