Merge "Fix unstable unittest due to RejectedExcecutionException"
am: af021f6dc9

Change-Id: I2eb631262d98562092bb5abe4c6a50c546d7e404