Merge remote-tracking branch 'goog/ub-deskclock-huddle'
am: b924c4854b

Change-Id: Ie59dfa7f31c54be4a23f278218a101db377be0e3