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

Change-Id: I0b5a043d4a055ef34327e4989859ffc12b47c1e6