Merge "Update account tester" into honeycomb