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