Merge "Fix some use of deprecated APIs in Support7Demos." into nyc-mr1-dev