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

Change-Id: Ib091ec185495184867b77528aee7492b9b571ada