Merge "Add Huawei pod6 and 7"