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

Change-Id: Ida079ce41a4eeb3a55d49507d911d4aa579d3799