Merge "Add braces per the coding convention"