Import translations. DO NOT MERGE am: 105e0aad45  -s ours
am: ccfc757f0a  -s ours

Change-Id: I0f6b9c90d6e702576f15d1164f4c2233330fdda5