Merge "Fix error message: getAllowedCarriers"
am: 112d039dfb

Change-Id: Ic04b23b87f56261c2c55f1e0a284109bf353c8d0