Restore user lunch combos

Change-Id: Id58f40baf924923890bcbbb1edf114a4b2f80490