am 63c8a47b: Merge "Fixes 5446301" into ics-mr0

* commit '63c8a47b7fb8244e8ee9fbcf40a77a30a9c98ca9':
  Fixes 5446301