Merge "[CDM Wear] Fix security issues for Wear" into main