Defy stuff

Change-Id: I4d24d552c5fc751337636023ea488c4e051d4adf
some changes

Change-Id: I47d01c501818ad84cdaedb4e9577e78880087872
fix

Change-Id: I3fa278e84f6559285e79a1fc749c637ed0873e4e