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

* commit 'c8b8b95fc108263dfe9882de56fa6f154aa69eb8':