[automerger skipped] Import translations. DO NOT MERGE am: 59b9b3af0b -s ours am: 2557c8ec83 -s ours
am: 30592b127d -s ours
am skip reason: subject contains skip directive

Change-Id: I667a0bac3b251d71f16f4d1c1a7aabdb646f36f2