am 18afaca1: Merge "DO NOT MERGE. Fix crash in vold" into klp-dev

* commit '18afaca1ad6f480ab6ac259278c8c8013aaab45a':
  DO NOT MERGE. Fix crash in vold