Merge "Make cuj be synchrous among atoms.proto and InteractionJankMonitor" into tm-dev