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

Bug: 136196576
Change-Id: Ic7b3ab0e0a8ba5a2d821df414022ba265713ec47