Merge "Fix cancel when the same notification is enqueued twice." into oc-dev am: 67ced6c08f
am: ef8ba7dc61

Change-Id: I5fa7da9a5779220deeaf00e00a5cbf3eca0a5ca5