Issues while mrproper

Change-Id: Ied73dca904c892fc593fcb64c6f3a26dbcf61dca