[automerger skipped] Import translations. DO NOT MERGE
am: 943d60667a -s ours
am skip reason: subject contains skip directive

Change-Id: I469c8b77afe405d36eabfb918513911ba249eeb3