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

Change-Id: I51febb2550e49d7cc0194d4e984c222c06f94f0d