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

Change-Id: Icbdd923657073e8d3df456ea967dc04c4ecd9b3a