Merge "Changed the name of chronometer countdown" into nyc-dev am: 8f32cd4306
am: 540aa3c8a0

* commit '540aa3c8a04386b7f0831d7c0ea8b98a31b44a21':

Change-Id: I9cc015613496e4285ed5b9f260a73529a41f8009