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

Change-Id: I9e66dac2b329ad2f6065a5208b8da471b14f66e7