Merge "Mark more strings translatable="false""