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

Change-Id: I0ea934f64f49c84683c47d646332842bd34ccb9f