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

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 9e3ebf3c am: d0726866 am: f351edd6 am: 49bc959e am: 9c3d1aee am: 319c9ac4 am: 1497b879
am: 02173b0c

* commit '02173b0c':