Merge "Add a flag to enable instrumentation of the framework classes." into nyc-dev