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

am skip reason: subject contains skip directive

Change-Id: Ie3afdfd7a7e11ebcbe5ae7d699a1fbd4ff5fd3e5