Add workaround for android issue 11833