Follow framework refactoring.
am: 001516a

* commit '001516aea295a40fe0174aa028d434fc4573031d':
  Follow framework refactoring.