am 4d71053b: Merge "attempt to fix bug 5313580" into ics-mr1

* commit '4d71053b0728b248d80d7d5a098df459722e2be0':
  attempt to fix bug 5313580