Merge "translate="false" -> translatable="false""
am: b333e79df9

Change-Id: I3955c9f03c741efa86fcf03baafea81d7073d5ef