Lekhani was tested by Subhashish and should be deployed

Change-Id: If8770a77d9cedc900b275c20e4f796d289b9f49c