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