Merge "Remove ADD_CALL if not only top-level call." into lmp-mr1-dev