Merge "CountDownTimer: not skip onTick()" am: 224d9e48fa am: 9997fcc72c
am: 9f0cc266ce

Change-Id: I75127bfd0fc4ce9256c775eaeb46582afd637e8d