Merge "Sleep activities with AOD" into oc-mr1-dev
am: f1ef6ef742

Change-Id: Id4bcfa48e8cd32449c82e5b501357a6315329e11