[automerger skipped] Import translations. DO NOT MERGE am: d860fcb67c -s ours

am skip reason: subject contains skip directive

Change-Id: I02e0d4e4ec16710a8c59e94afc5ae2af2f50b219