Also added support for mcc/mnc in the schema. Change-Id: I8a2d23797ec57eec69dc1d7218b01cd679634068
Change-Id: Ife64397692912f892ec81af8237ac31914830be9