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

* commit 'd0642c4274abcbede9177d61b0f072689db889a9':