Merge "Remove useless thread checks" am: 269d32a0fa am: c53b4accde

Change-Id: I7a1fe60971b733cb6bc3c848eeed8624210d97ff