[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 7d04cce017 -s ours am: 1767de8c60 -s ours

am skip reason: subject contains skip directive

Change-Id: Ia8370fae75446aa2e80a2316253df9d18422e72e