Merge \\"Remove framework dependencies on Support* demos\\" into nyc-mr1-dev am: 471af954c3
am: 8138f18d31

Change-Id: I29deb7e76048313a30c5a462a4851df095ce94b3