Merge "Add new call states and refactor CAMSM parameters"