Merge "Setting a system property when device goes into demo mode" into nyc-mr1-dev