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

Change-Id: I37c5987ab9c021a6762552a9bfa8214ec6ae1a16