Import translations. DO NOT MERGE
am: ffdd0d4fed  -s ours

Change-Id: Ib69d9610633295f6a24e2386a76ef8b1eef06ff0