Revert "settings: Fix warnings"

This reverts commit a1e5ca59a74b57e36370fd501b56049b6261d8cc.

Change-Id: I26f2851f07bc90dd74885cdee63caf7e0684dcba
(cherry picked from commit 29f58c70388857cad9f928e13881de619c1c7898)
Settings: fix MSim package names

Broke in a1e5ca59a74b57e36370fd501b56049b6261d8cc

Change-Id: I257c0ca2dc4e00b3a020b7cd68afffab39aae95d
(cherry picked from commit 2b5ad1694e849353118386ae96a8b0e5e24ea0c1)