Merge "Replace COMMON_CRITERIA_MODE setting with getter API" into rvc-dev