Change the instrumentation

Change-Id: I1b8d109fc0e42aabd94fff53bba7e035e1a3eaf3