Merge "Fix null pointer dereference." into nyc-dev am: dac26a76c3
am: 512af70bc4

* commit '512af70bc47804cf32b753f818503e58c88b6c81':
  Fix null pointer dereference.

Change-Id: I9959dea05e960b273c4d91981cdbca5ffc33e732