Merge "Test component type for errors too. With regression test." into nyc-dev
am: 5a13993

* commit '5a139938b115844fa2b81625d9a93927080f068a':
  Test component type for errors too. With regression test.

Change-Id: I90389e3612b6f2799809ad64f021cae44bc8203a