Merge "Remove framework dependencies on Support* demos" into nyc-mr1-dev