Merge "carrier id table update" into qt-r1-dev