Import translations. DO NOT MERGE am: ccde0787b8  -s ours am: 4367ed325e  -s ours
am: 3e664455dc  -s ours

Change-Id: I63ac14a3d355f0519b69b68c1f723aaa4a4da22b