Merge "Fix some use of deprecated APIs in Support7Demos." into nyc-mr1-dev am: 3561a66199 am: aa7e1ca342
am: 0d0cfd84ea

Change-Id: Ic360ba1d50cb4038bdc6a3eabd43744eaf09d646