Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release
am: 8dc2ca68c1

* commit '8dc2ca68c1ccf1570caec3e52c2671b323cf7102':