[automerger skipped] Merge "Fix bug of carriers/filtered/# URL doesn't fetch subId correctly." am: 1963f4268d am: 719cfa7ab5
am: bb5f58c0e7  -s ours

Change-Id: If83da5e3cf73300382820af14c57facaa91e6e64