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

Change-Id: Ice19b1d5232e5a7a6bafda7b9cae8bf3f66de966