Import translations. DO NOT MERGE am: 23c4362dac  -s ours am: cc10f6ace1  -s ours
am: a69031ef26  -s ours

Change-Id: Iff42e801f1b64b00f798a92dd3f3e2639c8b6cd5