am 52356ab1: am dc9555fb: Merge change 24464 into eclair

Merge commit '52356ab108597dd6014fcf4eaad54b336fb95b67'

* commit '52356ab108597dd6014fcf4eaad54b336fb95b67':
  Fix for bug # 2023074: settings db updater broken at version 34.