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

Change-Id: I72c0a187cdec66e86b89ee0ef83b34f86a477858