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

Change-Id: Icf338880582ec6f3855c3fc06f2f09fec5fd6bd7