Merge "Fix null pointer dereference." into nyc-dev am: dac26a76c3 am: 798ba98d5b
am: 3b3c68fe4d

* commit '3b3c68fe4dd831de3e0745e9d21308b144ccb241':
  Fix null pointer dereference.

Change-Id: I2cfe0c7bb581b26fd92e5c5244098e3ce057a53f