Merge "Fix instrumentation_for to refer to name of module"
am: 24ead5672b

Change-Id: I3e18013e7e5ab52bfdd708655a1a40ec7cfebb48