Merge "translate="false" -> translatable="false"" am: dd87b30266
am: 2225dc01d4

Change-Id: I580f58080a01776837249afbb93e02a6ce79a33d