Merge "Add some TestApis to fix build."