Merge "Add a couple of new benchmarks." am: 0ec8bea93c am: 64c417575c

Change-Id: Ib28fba63c230820aac2c9d96414b79c9b3c927e3