Merge "Reduce the calling times for isExtraDefend" into tm-qpr-dev