Merge "Sleep activities with AOD" into oc-mr1-dev