20130809.2 - more android fixing