[automerger skipped] Import translations. DO NOT MERGE am: a4cac4b609 -s ours am: 10748d60c0 -s ours
am: 0a8a60d3d1 -s ours
am skip reason: subject contains skip directive

Change-Id: I8bffb9d342d031a9fdfb78e651f5d5271c72f8e6