am 941ff38d: Merge "fix bug 5942522" into ics-mr1

* commit '941ff38d05f1d870df224ac329d16ab2207b94a1':
  fix bug 5942522