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

Change-Id: I8736e71c23fbc5e83278eebba0826119924e34fd