am dda53cfa: am a40c3a37: Merge "Discard mode bits during upgradeDB check." into ub-gmail-ur14-dev

* commit 'dda53cfa2b74febae9e128d9d4e834434b07e7e4':
  Discard mode bits during upgradeDB check.