fix for teardown assert on android - possibly MPLY-4889 (but different branch). Buddy: Malcolm