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

Change-Id: Iec39c3c20fdb63b908c40ca9273a17e1baef8612