Merge "Null check for accountComponentName and Id" into nyc-dev
am: 6a39673606

* commit '6a39673606ee7801e62151000942748a73e67626':
  Null check for accountComponentName and Id