mecha: fixes to have lunch sync properly before jb/3.0 bringup

Change-Id: I9376e6e43fb9b8cc71bf945327c2ee9accd2eb76