am ea45c2cb: Merge "Fix NPE" into ics-mr0

* commit 'ea45c2cb53b4d745f43850dcc4e794748425c5df':
  Fix NPE