Import translations. DO NOT MERGE am: c11e301ca4  -s ours
am: d648bf6c97  -s ours

Change-Id: Ie71321d8f308029a3d856a18d9d6350ef53351b4