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

Change-Id: I0400b0218a3a92312aec3ca668b5b0025901ed97