Merge "Remove 2 sub-tests from the internal test app." into lmp-mr1-dev