Merge "Fix performance regression."
am: 73de4a8f09

Change-Id: Ifd8dd5530c706d4f581a1bb9461e1f2f991d25d0