Merge "Differentiate dnd countdowns/countdowns to an alarm" into oc-mr1-dev
am: a33b64cea0

Change-Id: Ie60c1cacfc50eb20049569656790ef27367a3c9f