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

Change-Id: I235e44243027614c29fb1cfbc01d0e28e6dacaa0