Import translations. DO NOT MERGE
am: f0f33ea959  -s ours

Change-Id: I955b189d19bb52e2c9a140808d99604fc59aaaa5