Import translations. DO NOT MERGE am: 9c34517b9b  -s ours
am: 71da905501  -s ours

Change-Id: Ib84b3f953dd0a5bd4d7313822f3001b1bc78f8aa