Merge "Ensure backup doesn't reuse ack tokens nearby in time" into oc-dr1-dev
am: 672f578fd1

Change-Id: I110ab6b96ac3fd866ace40fbe47614e2ad73a787