Follow framework refactoring.
am: 459c07b

* commit '459c07b47f3ededf9489a2284a0bec1f8201c7b3':
  Follow framework refactoring.