Android port for v1.6