Merge "improve carrier id documentation" am: e425fbeeb5
am: c853138e8b

Change-Id: I4cc1933dda14fcb3e89773d8569198b41c668eff