[automerger skipped] Import translations. DO NOT MERGE am: 292e7ad110 -s ours
am: 2759932e72 -s ours
am skip reason: subject contains skip directive

Change-Id: I716345ea2e5b8e8d899d320ff2b8317b8bccf971