Merge "HIDD: Add caller permission check"