Merge "Also go to sleep when dozing" into oc-dr1-dev am: be1577ae59
am: efe90f8df1

Change-Id: I968bd2e3071f9f4024430b2718372339a57b6380