Import translations. DO NOT MERGE
am: 372fadc9f1  -s ours

Change-Id: Icc4d4057055faddeecc1e6bcbdccd82622efd030