Merge "Modify and add new testcases." into lmp-mr1-dev