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

Bug: 136196576
Change-Id: I127ae61add2e34184b3c65ca64693cccf62b8a6d