Follow framework refactoring.
am: 6364dc8

* commit '6364dc89b6c90dab11997bd360a1e80d9bf282ca':
  Follow framework refactoring.