Merge \"Disable some QS functionality in retail demo mode.\" into nyc-mr1-dev
am: 31a37ed77f

Change-Id: I2ef9a862017dbff63aaeb130a6817066ca608d68