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

Change-Id: I57ae295ae26b3901998227f811d8005eedcbcdae