Merge "Switch the mmodule annotations to --show-single-annotation."