Import translations. DO NOT MERGE am: e480a1b11a  -s ours
am: 5845dc3e4e  -s ours

Change-Id: Iad93f62c8cec2749a5d42619cf78dbe50c5950f3