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

Change-Id: Ie1ea3ee801339639c131e5cb89b3024d13c4b24c