Merge \"Make sure we don\'t accidentally allow the night mode tile\" into nyc-dev
am: 126366dde5

Change-Id: I0f256958b8596ab07e27c6c026dc7e37d5a4028f