[automerger skipped] Import translations. DO NOT MERGE am: 6e879a95b2 -s ours am: 8e955ff80d -s ours

am skip reason: subject contains skip directive

Change-Id: I5419835ff9832607b4117cd1e8319fad7196c6c8