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

Change-Id: I33d7193643b189c9b51e240ad1a834bae3e0fc31