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

Change-Id: Iab914c58be7bba4abbbe746149f3491fc5915de7