Merge branch 'app-paths' into android-test-plugins