Follow framework refactoring. am: 6364dc8
am: 9d08610

* commit '9d086109a949cce0cd8db4673bda931624f893e0':
  Follow framework refactoring.