Merge "add support to query carrier list version" am: 46b48e6097 am: 1278ff33db
am: c121dc8d99  -s ours

Change-Id: I3896c8b1b72b46c3fea19c4844ae96b2c9ccaef9