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

Change-Id: I376f320659cc71fd0be58bf027f0546dca3f612a