Merge \"Make Night display off by default\" into nyc-mr1-dev
am: acef1eb7c6

Change-Id: Ic7de47c6ad8417ab91f2fcf981ba2f7a7828db98