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

Change-Id: Ia48d7c96454c2361bb8ad0ce9c76ff3dc36830ba