Merge "Add mechanism for granting permissions to old vendor images"