am 9b8b540e: am c98ba511: Fix http://b/2305223
am 9b8b540e: am c98ba511: Fix http://b/2305223

Merge commit '9b8b540e33514fd99604e8265fd311187be3ddf0'

* commit '9b8b540e33514fd99604e8265fd311187be3ddf0':
  Fix http://b/2305223

OrBin/SynClock-Android,dseuss/deskclock,dseuss/deskclock