fixed borders issues

bug:8315216
Change-Id: I04d62984c70e7e514b8625e6a4b5ed9395137471
6 files changed