Merge branch 'master' into android-test-plugins