am 8bb76397: Merge "add sanity checks when updating snap header in-place" into jb-ub-mail

* commit '8bb763979df5ae90ed630611065657174d8c0721':
  add sanity checks when updating snap header in-place