Merge "Fix atom id annotation parsing" into rvc-dev am: 4efa78539d

Change-Id: Ib2e2f8e13de6fbe59c8c7f59347e0c01ffc64b29