Import translations. DO NOT MERGE am: be8ae70876  -s ours
am: 742f2a3322  -s ours

Change-Id: I31633b64e1f60b00ab8b790dc664f062c476414a