Merge \"Remove framework dependencies on Support* demos\" into nyc-mr1-dev
am: c295a4b23d

Change-Id: Icd4eac0fafdae01d95910dc084787350168a8688