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

Change-Id: I360aea3f1163628e51c3191bae15165b918f1c1f