Merge "Fix translateable -> translatable in .xml files" into pi-dev
am: 9f38c5b856

Change-Id: I719cd657be85ebb792f45f4ce5f0a2607a404e4a