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

Bug: 136196576
Change-Id: I9888ed0146c2ced8c5cf6bbff51e64d2bdf0d373