Merge "Null check for accountComponentName and Id" into nyc-dev