Merge \"Add a flag to enable instrumentation of the framework classes.\" into nyc-dev
am: 15783f0073

Change-Id: I9439934c0fff5c0e23fe0000252c8781f0540a81