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

Change-Id: I19da20eeef5818662753ff341dfd11bca29eecb6