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

Change-Id: Ie250d550d4ff3a75369d165b76d29f9a2ff43731