BUG 1359:Fixed using option 1

Change-Id: Idb744e4c1eab70ee8a3eeaaf8194f33f91aa84d4
Signed-off-by: Vaishali Mithbaokar <vmithbao@cisco.com>
Merge "BUG 1359:Fixed using option 1"