Add extra context to i18n wbeditentity-override

Change-Id: I9e5ea1549d0936ebf07d57024bbc3583b0ead8d4
Merge "Add extra context to i18n wbeditentity-override"