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

Change-Id: I23336cd7dac59a0e2510b718ede8ae3a389047ac