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

Change-Id: I83594c7a760c5f721a593e373965e29d35b9affd