am 1024c176: Merge "Add null check" into ics-mr0

* commit '1024c1765e892432975510dddc784c1360975247':
  Add null check