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

Change-Id: I24f7957a801b483d0aefa691868e19d2923d09c2