Merge "Remove uses of deprecated methods in Support*Demos."