Android changes commit

With some more testing