Import translations. DO NOT MERGE
am: 8d6b0a0a4c  -s ours

Change-Id: I05d7edeb809800a04e0ba9f47966de8d4e391b09