Merge "DO NOT MERGE. Fix crash in vold" into klp-dev