Merge "Fix hint in AlarmActivity." into ub-deskclock-army