Merge "Settings: HU translation" into cm-10.1

Change-Id: Ic320c4a5601131d8896680e335003cef0c3fcfbf