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

Change-Id: Ia37637693fc7c8829c53826f42575b7f6ef62499