Merge "Support multiple module annotations per atom" into rvc-dev am: 513453c253 am: 40f146af11 am: 1abe535d70

Change-Id: I901515c45ab1f9ce445fbc68f5b74fbd36c500bb