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

Bug: 136196576
Change-Id: I1661da4c7804cfb951733e388cb626ee3da22b59