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

Change-Id: I084dd2a1415c9242c9eb76f9d2f43567f1fd8e04