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

Change-Id: Ib8415dba6b5ec210768f2138ed5e73923b98a14c