am f8a201c9: Merge "Handle pre-MR1 in undo notification" into jb-ub-mail-ur8

* commit 'f8a201c970d3857fc176bfae09e72aae7e05eab9':
  Handle pre-MR1 in undo notification