Merge remote-tracking branch 'goog/ub-launcher3-calgary' into HEAD am: 969934f908 am: c61e5b02e0 am: 63e34444e9 am: 84dfd5a409 am: cdc1a6f7a7 am: 4e95e94d26 am: e1bd88b8c0 am: 756b7791b7 am: 8db54c16d2

Original change: undetermined

Change-Id: I8887b5b036cd16906267c2300ed0aa550d68a732