Import translations. DO NOT MERGE am: bb3e765b77  -s ours
am: 57d0077833  -s ours

Change-Id: Ia3fa4dca2ae1d68b1e42f2f8024971a1f085b17a