Merge "Add test to check sock addr in qtaguid ctrl file" into oc-dr1-dev am: c27e548346
am: c50605ed51

Change-Id: Ic5ac97d78af2d25cb9e35ee3cf82695fa64aaed6