[automerger skipped] Import translations. DO NOT MERGE am: d49c677499
-s ours
am skip reason: subject contains skip directive Change-Id: I6e10c86bf149e6eae1e1efbc00da7ec2e0e86c88
This commit is contained in: