untag android events in steps
Merge remote-tracking branch 'origin/master' into v1.9