Merge "improve carrier id documentation"
am: e425fbeeb5

Change-Id: I85569960ac0d290632e3a35af3f1cfc49f4d7270