Merge remote-tracking branch 'goog/ub-launcher3-calgary' into HEAD
am: 969934f908

Change-Id: I81db42f00242929b486585e4fe6d7baeed195fd2