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

* commit 'ca7d7541c4cad188eb643113e3c3e91e63d21a5e':
  fix bug 5942522