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

Change-Id: I74040eff36d0301231e53a8fd5cfa7d577053ebb