Import translations. DO NOT MERGE am: fa6279f670  -s ours
am: 208e9a6fb3  -s ours

Change-Id: I273349ceedd87f8da02c48f42ece459cc0d71822