am c59a9a3d: am 597a8ec8: am 6075170b: Changes corresponding to framework changes.

* commit 'c59a9a3db29fdee3ad85d6b94f899a49075206f9':