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

Bug: 136196576
Change-Id: Ib03be2ef57eeebb96f260d991b7d0f59bf3cab68