[M11n] Add missing defensive copies

Fixes: 71502922
Test: Ensure attached bug no longer reproduces
Change-Id: Id0f6e92fab4f2472cc1c22d47249ec5bbba43b3b
2 files changed