Merge \\\"Add null check, fix annotations and warnings in node provider\\\" into nyc-dev am: 8156121ddf am: 9cdf1730b4
am: 8516c39406

Change-Id: If9b4531f2173020c68e795063ef1c10131538c2c