Merge "No need to lock when calling Thread.interrupted."
am: 47aa869c16

Change-Id: I5bd9f810e94e6c77783cdf1c337f39eb1b5d24a6