Merge "Allow annotations to be added to Atom Id" into rvc-dev am: 027c8238...
Merge "Allow annotations to be added to Atom Id" into rvc-dev am: 027c8238 am: 0ae69533 am: 102b1d6e am: fa79f0dc am: af11ebbf
Change-Id: Ie655d82ce9cfd37f76aa4dc0b690e021444d932f