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

Change-Id: I3239d0cd5f9facecb933e40d0eda7f8bfba9502d