[automerger skipped] Import translations. DO NOT MERGE am: d20e87e9b2 -s ours am: 36b798d945 -s ours

am skip reason: subject contains skip directive

Change-Id: If4e3883ca88e550a07c0e6df0f5d381f37c289f2