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

* commit 'fed7a99a5294856d930e18225898828bd6755be1':
  Quick fix for bug 5646217 blocking automation tests