[automerger skipped] Import translations. DO NOT MERGE am: a5010cf5ae -s ours am: 24a2fe0917 -s ours

am skip reason: subject contains skip directive

Change-Id: I84097b16bb946ec9769dcbb3f7f27d5000f00ca9