Merge "Benchmark: add Extractor" am: 431988bcfa
am: b96cec5792

Change-Id: Ic413d9854230df9ba0d8ee063078f8529cac5962