Merge "Fix all uses of deprecated APIs in Support4Demos." into nyc-mr1-dev