Merge "Core: HU translation" into cm-10.1

Change-Id: I61e567418d4f8a4cdfd576a74cb229f6afb65ae5