Import translations. DO NOT MERGE am: 782f3d7c49  -s ours
am: 170105d749  -s ours

Change-Id: I6e006b2e086797acdc144708c648a45aa68d6e95