fix test merge screw-up

Change-Id: Id09d609c97872f7578b33e981d397fcdf7241e1b