Merge "Tag modules for their sim card required" am: 35a4173f8f
am: 2f4925137d

Change-Id: I44e71b424df8e62005944c7469f9a2592aa132ea
tree: f38e0a1098509e066c237ba9894cdcd277d08b70
  1. tests/