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

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: a2bc3772 am: b7b834bd am: ca2bafc8 am: 97742812 am: 6df4bd8b am: 7f4c5f36 am: 22c5b7f5 am: 128ffad0 am: b1f7d716
am: 7ef65988

* commit '7ef65988':