[automerger skipped] Import translations. DO NOT MERGE am: 6eb86cae2d -s ours am: 5ed6a8a579 -s ours

am skip reason: subject contains skip directive

Change-Id: Ie1dcc2369376df38ae7e55a7e112ac03c8fad618