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

Change-Id: I93428c92a12a352fab191edc6328563259d5f38e