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

Change-Id: Ie1d237edf656c49fb0b078748b4e45142f454386