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

Change-Id: I3d8664f74250bda3737d7851d37af857cb2f7214