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

Change-Id: If62a8b9d7b4a2c36d20cdb00877563a5586a5f72