Import translations. DO NOT MERGE am: 2a1d7f9dd5  -s ours
am: e1af21d173  -s ours

Change-Id: Ic208da8e7e3e78316fc70cb37fb9c0cf7dd54c73