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

Change-Id: I7507b2d5b974c17a388360a52b57aa7ee41de919