Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release...

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c am: 2feee6de am: ab3847b8 am: 0cce0579 am: 8c9ef49a am: cbdc9615 am: 1115f891 am: e1ac2ece am: 856f970b
am: 94d220ca

* commit '94d220ca':