my test
changes for GerritHub
ssd
ssd
merged conflicts and edited layout template
removed some text
Merge changes I47b18b58,Ieb67171c

* changes:
  removed some text
  merged conflicts and edited layout template