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

Change-Id: Id8dbb455c2de11aaec819ea5da9c492c7f6800b2