Import translations. DO NOT MERGE am: d8b59a6892  -s ours
am: 7ccd89ab81  -s ours

Change-Id: I443a9acf71ecd2523a138e3eff53cc2f0e918ce7