Merge "Clear data deletes too much" into jb-mr1-dev