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

Change-Id: I12a4d639233a02d493707ac1093d3ae796015244