Merge "new columns of carrierId DB" am: 9c4b4afcbc am: c5d5be72a3
am: e9cbcf42ad

Change-Id: I56ac7b277ea7c1f496291dcc8d25c6126beb346e