Merge \\"Add missing null checks\\" into nyc-dev am: 02e391585d
am: 8a953d02d9

Change-Id: I9e1fb3560f2d5e8484ddcd1451366ac0ac11c42a