Merge "Mark manage holder flag as test API"