am 0dfb1df6: am 810d5ed2: Merge "Use the correct lock to protect members in...
am 0dfb1df6: am 810d5ed2: Merge "Use the correct lock to protect members in PolicyControl" into mnc-dev
* commit '0dfb1df6':
Use the correct lock to protect members in PolicyControl