Merge "Add thread safety analysis annotations." am: e7ce8c8485
am: f23f21a231

Change-Id: Icbe910717db9805c06d761e79c435bb33d21d1cf