am 246a1bee: am edfc6a0d: am f4994b3e: Merge "fix bug 5911175" into ics-mr1

* commit '246a1bee9d5db1db3c91e0886b514598763193dd':