ofer 2 commit

Change-Id: I1d6ebfc415a52646bca8e8f1645e1b9f3ce4ad82