Merge "improve carrier id documentations" am: 5e5492f573
am: 1780c9e9f6

Change-Id: Ic0addd874e4934f62d2f63fc31bbc1c638530524