Merge "Attempt to fix the ActivityThreadClientTest test case failed."