Merge \\\"Add null check, fix annotations and warnings in node provider\\\" into nyc-dev am: 8156121ddf am: ed87f47588
am: 83bcb541ba

Change-Id: I85e6745bd635b082b2d9563a8e4ed4f15fedf2f6