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

Change-Id: Iee7cdf3066efea6cb75c40b908117ddeb19d1b52