Merge \"Remove \"Night mode\" from tuner\" into nyc-mr1-dev
am: e615e16ab6

Change-Id: I497cf51948597f8f70e756e4f11dac94c2d69444