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

Change-Id: I002491da9ea41baa5777c450c2e702600e1971e2