am 736ef1e9: Merge "Better API for low disk space warnings."

* commit '736ef1e9dedbdd0c24e27f170034f2f869fd083f':
  Better API for low disk space warnings.