Merge "Replace null checks is null object checks" into nyc-dev