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

Change-Id: I3fdb30af2db3035e4e4a39f4e72e0cf3f950765f