Round 1 of Japan Localization feedback changes

Change-Id: I7319346377c5263f914d549e85a9b2d9995e3324