Import translations. DO NOT MERGE
am: 50e19c566e  -s ours

Change-Id: I82b5f21b00ed2e75a74859ffe70560e6999902a6