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

Change-Id: I0f154b6218f0893529d9266e87ddfdcd81deca34