Import translations. DO NOT MERGE am: da8a98fb26  -s ours
am: daa2d5a23a  -s ours

Change-Id: I08237170e91f978d9f8718fff3df30c6f6be59f3