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

Bug: 136196576
Change-Id: I481d824726ae0260b42cd7a4acc1c6fce593c324