Merge "Add AccountManager key rotation awareness." into pi-dev