Updating the unstable plugin

@bhariharan Can you take a good look at the Android side?