Sync with android-plugin