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

Change-Id: I45dae3a5c23a32b625a44025d4e47597e49d6789