Merge "Quick fix for bug 5646217 blocking automation tests" into ics-mr1