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

* commit '301a724210cf9ed69b68c5cab92e87a7cccb73f4':
  Follow framework refactoring.