Import translations. DO NOT MERGE am: e65b214f31  -s ours
am: 584f7438ad  -s ours

Change-Id: I420d94ba079fa629dc1427b868a2633d98fd296a