- Additional code cleanup for previous performance CLs Change-Id: I41c9be9b1541d0717e32732823f5bb0bedcf818f