Merge "Fixed that OK button is not localized" am: ddb054cc2a

Change-Id: I1dd7cad7192fd7b2c0e860b7952e15cd1ce37b7c