am 7431a694: Merge "Fix NPE at startup" into ics-mr1

* commit '7431a694054d56b5d56410f708f97bc2a81ae5e3':
  Fix NPE at startup