Don't shadow cfg import in securemessage

Change-Id: I03ed9f1cbbc08dea43a5c93d6997eb4e633dfed4
Merge "Don't shadow cfg import in securemessage"