Merge "Remove usage of deprecated DayNightStyle values." into pi-dev am: a0d475a43f
am: 4d4b5b6810

Change-Id: I29d9ee5ce0de960c832386c1443c33acb424c55c