am 3ce8eb4e: am 55708a9d: am e03c0244: Merge "Clear data deletes too much" into jb-mr1-dev

* commit '3ce8eb4eb24f90b8d850e3dc7c18569dd1fd361a':
  Clear data deletes too much