Merge "Discard mode bits during upgradeDB check." into ub-gmail-ur14-dev