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

Change-Id: Ibc5eac1dcc31f89424644f8ce3bcf57481313d1e