Merge "Init sdk 29 carrier id"
am: 76b38b8a64

Change-Id: I9fc77bfb2ee9c2a7567dc3645cf8cf436388e975