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

Change-Id: I617998135fe62588290b83f5d9b1eab984967f40