Merge "Follow framework refactoring." into nyc-dev
am: 70022b2

* commit '70022b224a8f0ec2d60fb6b16b35eb596138428d':
  Follow framework refactoring.