Added echo on option

Change-Id: I7ad4c8ac46c031edf8469e5e71da4a16a48dc7e8
Merge "Added echo on option"