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

Change-Id: I294f1e88fb81aa64d80494c858f6850eb2d74b63