Merge "Remove unnecessary thread suspension"
am: 7bdc591cc1

Change-Id: If1052a4488653bfdd582e68dc78b69b951d019f3