Merge "Add framework module annotations in atoms.proto"