Merge "Add app compat test app."