Final(?) android commit