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

Change-Id: I21a0fe6886a4232bcb526dc8ade1dde41a7d0b72