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

Change-Id: Ica3fa0a9852d06323e1f21ac2da2118e8c7fe3b0