Update tests to use proto metrics interface
am: bd9f4cddca

Change-Id: I66775698441368d08e75eb31ae9059a0e4b1f0d0