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

Change-Id: Id98fe9c228215e5ffaa45d4eb02dc39c1a67a584