Merge "Remove useless thread checks" am: 269d32a0fa

Change-Id: I1dc9ce4e5ef5ca2012264fdb736606a36f20c8a3