Merge "Remove location mccmnc check until valid sources are confirmed"
am: 9d0a6b7d2a

Change-Id: I6ae749198e8713c08b95cd5e40cdffbd0a73beed