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

Change-Id: Ic3cd448883cffebeaca9bdf03d86a36df1faa125