Split mRulesLock in 2 distinct locks.
am: f0823858e5

Change-Id: If5cd09f47268b70e63c4c4c6ecae57f9b38c3ed2