Split mRulesLock in 2 distinct locks. am: f0823858e5
am: 5a3842b4ba

Change-Id: If229dd5941d35171e1fc0737bea4e2f2a22f9c47