Follow framework refactoring. am: a9298f8
am: 1775b73

* commit '1775b73f2b24298860b37849131f1977b52eb7c7':
  Follow framework refactoring.