Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release...

Merge remote-tracking branch \'goog/ub-now-lunchbox\' into lunchbox-release am: 8dc2ca68 am: a59ef0ba am: 8acd2748 am: 52599958 am: 1c13c137 am: d848ca48 am: 4cb42d16 am: aa27d4eb am: 96e7b9c7
am: 7c1c0fcd

* commit '7c1c0fcd':