Common L3 Workflow: Use <instance_id> instead of ZZZ

patchset2 rebases, patchset3 fixes whitespace

Change-Id: I3d9aeb4fdab7f6ae20d42031b464bb3c06ae6982
Merge "Common L3 Workflow: Use <instance_id> instead of ZZZ"