Merge "Follow framework refactoring." into nyc-dev
am: 99053b6

* commit '99053b6ad7fb036106627b37eded40d6ca3e3e9d':
  Follow framework refactoring.