Merge "Fix CTS - Test plans not generated." into lmp-mr1-dev