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

* commit '5842e41f3f336041569d2c3537491d2bd99ed1bc':
  Null check for accountComponentName and Id