Import translations. DO NOT MERGE
am: 8b6ea60fac  -s ours

Change-Id: I12822e9c629ed902c61db1aab8e93c755245449d