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

Change-Id: I4f34521e1b180a431b4df06ab615fc7191d18e60