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

Change-Id: I6c5b3c8702cf7471ad4800042cf63214682dd98b