Import translations. DO NOT MERGE am: 5e7d7e48f0  -s ours
am: 4b31a0eff4  -s ours

Change-Id: Id60a25c8695ac576cf98f15e55b885ccd9da1730