Merge branch 'android-notification' into android-test-plugins