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

Change-Id: I08a5c67070dafecdc72bcd9b68a850cff4b13e1c