Track local syste_vold

Merged 4.2.2 stuff