Merge "Fix snooze not dismissing when it should" into oc-dr1-dev
am: f113a07d9e

Change-Id: I71e7c2757c1fab1dfdcd59ab3dbf695179899fe7