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

Change-Id: I55ee187ee689855dabd565fa1a40fcc1e907339c