Merge "measure snooze UI use more precisely" into oc-mr1-dev
am: 72826c99fa

Change-Id: I1304ace99258426667059dd98c51ea7d4e10b00c