Merge "Revert "[CDM] Throw SecurityException when the caller can't acce..."" into main