Merge "Tidy up RulesManagerService code" am: d5517c39e8 am: ef21b72dd1
am: c2f58098c1

Change-Id: I70c224eb853e41ed216bebf608f9b540d69514a2