[automerger skipped] Merge "Import translations. DO NOT MERGE" am: 6be5877928 -s ours am: 8109231b98 -s ours am: ce03babc79 -s ours
am skip reason: subject contains skip directive

Change-Id: I5c4bf385b7a2c7f4d5f5231b8bf60d1f7e4f6483