Japan, China discuss disputed islands