Merge "update mapper to include android_health_service namespace" into main