Merge "Mark test strings translatable=false"