Import translations. DO NOT MERGE am: d8cf9ad720  -s ours
am: ae3c57da0d  -s ours

Change-Id: I35edc2725202cb92ed50f42b9a50ae3bdbd997e3