Merge "Remove flaky tests from the official plan" into lmp-sprout-dev