Merge "Settings: HU translation" into cm-10.1

Change-Id: I69d01c97bb61ec02b5622a98d1b9980d05e6044e