[automerger skipped] Import translations. DO NOT MERGE
am: 7d2d795e8c -s ours
am skip reason: subject contains skip directive

Change-Id: I91e2e0a43fc483e350213f62abe8a24f4e597c70