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

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 853b55b9 am: 61172868 am: 157e6c57 am: d078023b am: 5b55c46e am: 186a1a70 am: d566d24f
am: b0436f29

* commit 'b0436f29':