Merge "Merge "Update RulesManagerService after APEX files" am: ee15067180 am: 7421a00bb0 am: efaa3e6801"