Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 6cb8ae4c16 am: 2feee6dec2
am: ab3847b8b3

* commit 'ab3847b8b34a691cd829bfdf0776521349049adf':