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

Change-Id: I683e88e2642e7a125d7e63e2fbd51e622eb1aef6