Merge \\\"Add a flag to enable instrumentation of the framework classes.\\\" into nyc-dev am: 15783f0073 am: fb9d75e7cd
am: 568f654ac1
Change-Id: Ic58fc8aa667372d77836823cd77e0309e9b1e7c5
This commit is contained in: