Merge "Remove unnecessary thread suspension" am: 7bdc591cc1
am: ccd8d21f09

Change-Id: Ib64d1879dac71ec404f7ed43cfa03177ca1edb9e