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

* commit 'eb95dde9d6b5f81832225dd0d2f78adfb378815b':
  Fix NPE