Merge "add support to query carrier list version" am: 46b48e6097
am: 1278ff33db

Change-Id: Iaa71504d5c0634c860a4cda5764450052a575459