am d490a1a3: (-s ours) am ffe72f70: Merge "Use the correct lock to protect...
am d490a1a3: (-s ours) am ffe72f70: Merge "Use the correct lock to protect members in PolicyControl"
* commit 'd490a1a3':
Use the correct lock to protect members in PolicyControl