Remove extra closing curly braces after merge (or stash?)

Change-Id: I42e27ab0db138a3a7a05d968fa75919dfb92565c