Merge "cma: Remove __init annotations from data structures"