Merge changes from topic "blockobenchmarks"
am: f87ae40621

Change-Id: I11495fdcfc5592dc7faa2d5d326afab61df9b6d4