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

Change-Id: I86bba886037d93723957a33f913f6fa0c05e8b0f