Updated adress test to new Nicu Goga's sd1

Change-Id: Ib0a8116307d3e1ed586d58e04977247e54f87ef8
Merge release-5-0 into master

Change-Id: Iefba678e2a2ecd9775709f46ea5ce487679e620e