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

Change-Id: Ibcee70544e188923f94b8d79a02db83f0fe48d3d