Merge "Revert "remove /dev/log""