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

Change-Id: Ic66bd4cda32ee09da1e8759bb47cb9a0c842ec23