[automerger skipped] Merge "Fix setAllowedCarrier" into pie-vts-dev am: 052f207b42  -s ours am: 222caea32d  -s ours am: c525730843  -s ours
am: 48e78ef6f6  -s ours

Change-Id: I3b4b60581ad38bdff6994ddccccce910743be4d0