Follow up for MMI localization work

Bug 890291
Bug 890463