Merge "Core: HU translation" into cm-10.1

Change-Id: I0e1703c3c0e7f9d9dfdefe9734c3d59ab241b190