Simplify

Simplify-Generated Messages for On-Device SAF