Merge "Settings: HU translation" into cm-10.1

Change-Id: I8ab547a2063f737ef18fdd0037b30794ff686075