Merge "Fix null deref crash" into nyc-mr1-dev
am: fc9689e1ed

Change-Id: I613ee5b94999d50037954dff7bb4716f596fa8d6