Add benchmarking to verify this is faster. Test: Ran unit tests. Change-Id: I1487114331f4581ec2368e56c4f18c6e3e6bcc7d