no more shakuntala-three-zero

Change-Id: Ieb542fc0ed330c5827879c2f02082bc4884397b1