Merge "Update makefiles (vibrator open)." into oc-dr1-dev