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

Change-Id: I4a5d45d9c33b713e6bdf0596ea498c3e521c26d8