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

Change-Id: Ic5a60c0bcc2d686d97957778838d87b1e251f87d