Import translations. DO NOT MERGE am: 1e0cc808ab  -s ours
am: ea79b5e4b9  -s ours

Change-Id: I8bbf684868532c604f8100d23efc7f192c7e8703