Merge "Fix performance regression." am: 73de4a8f09
am: c0fcffae9f

Change-Id: Ic71f8aba645659768e6ad6edd0b29e73c1e00860