Merge "Add OWNER to Virtual Device Manager" into tm-dev