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

Change-Id: I603568a7168fb3b8a4a946d937b754f13b3d917c