Merge "Don't clear snoozed components on restore." into oc-dev
am: f1c7b9e121

Change-Id: I8d899a642d8bbb8b5e180c27198fd1c311f34e91