Merge "Settings: HU translation" into cm-10.2

Change-Id: I447518f4675cac0fd81ca2c39e125c934a5e922d