Merge "Allow managing through instance IDs and enable manage tests"