more work on standalone Android mode
more work for Android mode