Merge "Fix issues for Japan model." into android10-tests-dev