Merge "Common Criteria mode: Rename Common Criteria mode from NIAP mode. (1/2)"