Merge "Fix issues for Japan model." am: 66d9a93a71

Change-Id: Id62eb668737bacba26d020470868b47571e37bb8