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

Change-Id: Ic04259ff8446ef2c500f8d6fee6211b80847c911