Merge \\"Add missing null checks\\" into nyc-dev am: 02e391585d
am: 0fc8707e2d

Change-Id: I9b8122c0a67be36b00cae06ce543a9de7aca8d40