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

* commit '56ca86b7c177fd6fb330d6cb3631070e8689cd87':