This elif android block looks like it might not be needed now?