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

Change-Id: Ib6dd7fb5af9678f7e8bfc8ce55d4f34e9b7a7b59