Merge "Improve error detection in app compitibility test" into lmp-dev