Merge "Fix issues for Japan model." am: 66d9a93a71 am: 7fea784ede am: 2c91f575a8

Change-Id: If011be1090c3873a04bf6fbda4345c6bc5d28100