Update Vigor adds to cm-10.2 branches

Change-Id: I4e8f3e77afeacd4872ee2101ca95c59e4d624a43