Merge \"Merge \\\"Make sure we don\\\'t accidentally allow the night mode...
Merge \"Merge \\\"Make sure we don\\\'t accidentally allow the night mode tile\\\" into nyc-dev am: 126366dd am: fac0a50c\" into nyc-mr1-dev-plus-aosp
am: 03ca53c1
Change-Id: If41932f8ff4e9e9019d8f81ce7e9a98743e4df24