Merge "Security: Add @SensitiveData annotation."