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

Bug: 136196576
Change-Id: I31b019b595c8dec9874140f575fdeb61c5866a7d