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

* commit '07130d400c52518e413e58334525f1598c3b8f1a':