am 6075170b: Changes corresponding to framework changes.

* commit '6075170b838bfe7a040bbff25c2c22859b7d6ee5':
  Changes corresponding to framework changes.