Merge "Fix error message: getAllowedCarriers" am: 112d039dfb am: 03f4a0f034
am: 96b140489c

Change-Id: Icec36f8895e4ffb081989973abf563fddbf2f2fd