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

Change-Id: Icb485bae8bd2cde8c467e8ec0230a7f3a9a79474