Fix border css

Inspired by Ia244a5070

Change-Id: I07cbb1dda091cf2117e8e22d4ea3a25e9e16dc2e
Merge "Fix border css"