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

Change-Id: I1fe7386983bd536d983b1bb63a8bdcc91cf275ee