Merge "Fix cts DeactivationTest#testDeactivateAdmins failed" into nyc-dev