[automerger skipped] Import translations. DO NOT MERGE am: 2f6ed0524e -s ours am: 22f595b2c5 -s ours

am skip reason: subject contains skip directive

Change-Id: Ibc2e02b9a444eb64fafda11bee4711c4638c93ac