Merge "zygote: drop braces on single item rule"