Import translations. DO NOT MERGE am: a11c4b93ec  -s ours am: dc21bbfcb0  -s ours
am: 09e2eb749f  -s ours

Change-Id: I6cf034294ee9f95ff9e58eeda719e720bf2bbfe6