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

Change-Id: I7843b433e704df6349c4f9156cb87ed928c9543d