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

Change-Id: If8fea9defc84fcd3f7f8f2c98dcb00f13f7ffffc