[automerger skipped] Import translations. DO NOT MERGE am: 17af9260f8 -s ours am: 7ace0fa99b -s ours

am skip reason: subject contains skip directive

Change-Id: I0e3ae8a15ea1c94bc86f20229e710a12038b228b