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

Change-Id: I67905480e35a84ce5faa48d08c6893d2c5f28eaa