Merge "Merge "Fix null pointer dereference." into nyc-dev am: dac26a76c3 am: 512af70bc4" into nyc-mr1-dev-plus-aosp
am: 93089012f2

* commit '93089012f2dc490f410cd0285907bef5fcce7adb':

Change-Id: Id8623edcc89bfb457aa0fa3d91eb010ad28ffa46