Merge "Fix tone region(for US, CA and JP) recognition for dual SIM" into nyc-mr1-dev