Merge "Fix bug of carriers/filtered/# URL doesn't fetch subId correctly." am: 1963f4268d
am: 719cfa7ab5

Change-Id: I8ccd7405d6634ae8bd4145ae608b6b0a1ce3b702