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: fb9d75e7
am: 568f654a
Change-Id: Ic58fc8aa667372d77836823cd77e0309e9b1e7c5