Follow framework refactoring.
am: a9298f8

* commit 'a9298f88442aae49a0817513209230e3e6e8d4e0':
  Follow framework refactoring.