Import translations. DO NOT MERGE am: aea9066fbc  -s ours
am: 6716c266c5  -s ours

Change-Id: I15e2b63987d4f787a3d9382ed649a8e635dca0b8