am 6e8dc357: Merge "Fix NPE" into ics-mr1

* commit '6e8dc3572fb424b488e09fcc2e695a2655cbb68d':
  Fix NPE