Import translations. DO NOT MERGE am: ef89f62670  -s ours
am: 42318626f2  -s ours

Change-Id: I22220f722e4292777d8fa3413ed65f5be4ca4aec