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

* commit 'de5af8b8fe829d0767dabf338e0090bab5ee9bf7':
  Follow framework refactoring.