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

Change-Id: Ie8ff976d1ff659b2a2c27a5a937600880f2636b4