am 61a9a83a: am 40226da7: am f4994b3e: Merge "fix bug 5911175" into ics-mr1

* commit '61a9a83ac09246f815806fa4f64cc65a7e876f96':
  fix bug 5911175