Merge \"Setting a system property when device goes into demo mode\" into nyc-mr1-dev
am: 24db3ab8b9

Change-Id: Iadedc063f7058a7d1f22e0151a8ebfc9a6a8dff1