Merge "Fix copy-paste error in TransformIterator." am: ca20fb6cc4
am: c7f068d2bf

Change-Id: I3fe9d74390e4f6c6c30555650ff4d83985b7a64d