Import translations. DO NOT MERGE am: b8206529c7  -s ours am: 288ba25e96  -s ours am: fff4c2d598  -s ours
am: 221dba796e  -s ours

Change-Id: Id2a11020ff9c9b64f86a0dd51ecac8a449e8dea9