Merge "Remove atoms_info.h imports" into rvc-dev