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

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 56ca86b7 am: 52cced3e am: 9cd759a5 am: a9d4118a am: 8020ebf7 am: df112558 am: d2688e3c am: f051b613
am: e1aa8a0a

* commit 'e1aa8a0a':