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

Bug: 136196576
Change-Id: Ib1273e5e4f2f69c97cac5005d6bb2586efc4fd99