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

* commit '3c78e101ec3ad427bf0341e3134659346fa06cc0':