Import translations. DO NOT MERGE am: b081f1e809  -s ours
am: 43b03fbacf  -s ours

Change-Id: If3ad876fdb726d199a8ccc26a1808f358377e44b