Merge "Fix unstable unittest due to RejectedExcecutionException"