Merge "Remove redundant code to check container type." into nyc-dev am: 29f3b2e
am: a33067c

* commit 'a33067c5dceb424fa71fdc4ee72702988101fe16':
  Remove redundant code to check container type.