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

Change-Id: Ib8e7f361568b67471e23e8fdacefa7ba4daff952