Fix border css

Inspired by Ia244a5070

Change-Id: I16319fe49b1c359bc6b57fbaa8deea8154847d7c
Merge "Fix border css"