Merge \\\"Add a flag to enable instrumentation of the framework classes.\\\"...
Merge \\\"Add a flag to enable instrumentation of the framework classes.\\\" into nyc-dev am: 15783f00 am: fb20170c
am: b216e809
Change-Id: Ib7d63464ea7a042ea5461ce62928ceb8a3c01c0b