Merge "Ensure that we don't overwrite suspension target thread"
am: 2727d7ca49

Change-Id: I714358fb0de650d010327c0fa89e3839b55a7456