Fix Translation Derps

Change-Id: I6b104b3a9be0d06fb7857d288ad24c6bea498072
Merge "Fix Translation Derps" into jb4.2