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

Change-Id: Ib7d63464ea7a042ea5461ce62928ceb8a3c01c0b