Merge "Fix annotations in ImsSmsImplBase"