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

* commit 'd70eaff41ce4e033656eeebb5eb7153b49d2ac5a':
  fix bug 5942522