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

Change-Id: Ibf855ee79f06e4c1cc91e8deb61a4b9a7804d5d3