Merge "[Feature][T8TSK-218]add rollback when bl33 broken" into MR3.0-merge