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

Change-Id: Icf5ac8eb8d36f5ee5a3dc4c61201b7184c78bc7e