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

Change-Id: I872ba067ed2254b56d82c5332c5afdf79ef87407