Merge "m7spr: update eri to reflect correct home and roaming modes." into cm-10.2