Fix lunch

Updates because PA team got a hair up their ass and changed everything for no reason.

Change-Id: I3ed64cdcadd72bfe2f0607cae6182c6610818b97