Merge changes from topic "blockobenchmarks" am: f87ae40621 am: c34dc6e2cd am: 31c7e76755

Change-Id: I670279f575bba691d72e2c731d9ff5ad50bb5105