Merge "Allow recovery to read /proc/cmdline"