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

Change-Id: I82b2246fbb8835abe641d6d21ef089391b5320af