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

Change-Id: Id42d5307c4dd5f755d3d7f76120b500a22a4c6a9