Merge "Optimized locking for get/setUserData" into oc-dev
am: cfd0e95db4

Change-Id: Id7a3aa64ff15babb83ad6263485d3c90c2f81d26