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

Change-Id: I12b6017fdd0c280b5e023269fb8a52f717528c1c