Import translations. DO NOT MERGE am: 433cb3227c  -s ours
am: de8c1dfbad  -s ours

Change-Id: I9db6f7e23671be09b10aa5be9bea23fe6f414e42