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

Change-Id: I55c5f5d2bf0c1b610af645dd6f66545e95f2a930