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

Change-Id: I231572aca47fd417e281966e2c2ec510185d80d7