[automerger skipped] Merge "Changed regex matching for MCC and MNC" into qt-qpr1-dev am: cb97705a1c
am: 76bb761a8e -s ours
am skip reason: change_id Iaeb9ff9e2a5a82be66855378831cd52ee49e3c5c with SHA1 cb76b14fdf is in history

Change-Id: Ib53f02bd78fca1dadc43766d52c7ab70fa629ecc