Porting changes to android