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

Change-Id: Ie06475440938e97772e78b6cfe4fb4bf497da1cf