Merge "Add an empty line to match AOSP"