Initial changes to support mac stitching for local-vm

Change-Id: Id5fd211aff660b929f80eae554af664f659efe27