Merge "Update RulesManagerService after APEX files"
am: ee15067180

Change-Id: I7454b85b13ecf5c3946190d316e3d07e72d4e620