am 18f590a9: Merge "Remove EXTRA_DELETE_AFTER_USE and update descriptions...
am 18f590a9: Merge "Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly." into klp-dev
* commit '18f590a9':
Remove EXTRA_DELETE_AFTER_USE and update descriptions accordingly.