Import translations. DO NOT MERGE
am: 9b11a3cea8  -s ours

Change-Id: I4682fbbdc6491a54ff75cdf15a6710a067d9ce2e