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

Change-Id: I5ec7c792775c69a245da1ebd104d90b32d8e67f6