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

Change-Id: I6a587003900358aeddf32eac184668f483a381b1