Merge remote-tracking branch 'goog/ub-deskclock-gatling'
am: b3c676f70f

Change-Id: I647e0bc41bd396d286d54a5dc8670a89c3956002