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

Change-Id: Id3f14cb0e909cf8215bbc8540d9986f036d65df3