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

Change-Id: Ie210e68d41ee919a558d8c364c17a2b85546e897