Merge "Follow framework refactoring." into nyc-dev
am: 8196a91

* commit '8196a91d00afb10864d43bc9433bc08b355a03bd':
  Follow framework refactoring.