Import translations. DO NOT MERGE
am: 2dceb0fe40  -s ours

Change-Id: I832e1220d68e97f65736dcd83c593a092662cd0c