Import translations. DO NOT MERGE am: 02ced36ad1  -s ours
am: 74d24b92e1  -s ours

Change-Id: I678783cc7cdf78196d5585d95d58afc4220222d0