Merge "Update required due to framework API change."