Merge "Base: add more thread annotations" am: 3f3ea50828 am: 551b5b7b1e
am: 297f1864e1

Change-Id: I4577d06727e401b39f145243a59610b4693f322d