Merge "Remove only selected messages for vold reset" into rvc-dev