Experimental changes for android performance