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

Change-Id: Id820e24ba78c54bb939295b2c52acfc70f1a8a43