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