Merge "Annotate locks" into oc-dev
am: 373ab72112

Change-Id: I7b84a944d19c1a51d3893149e98c9e6ac96ba2af