Add metric selector

Change-Id: I5b7b0dff6d350fc3f01b8b291215b164df0d1b16