Follow framework refactoring. am: 001516a
am: 4b9f283

* commit '4b9f283871fd041d7ab8debe354e669297ba8302':
  Follow framework refactoring.