Import translations. DO NOT MERGE am: 5403c74434  -s ours am: 0d92f75de4  -s ours
am: 29bbea374c  -s ours

Change-Id: I8488c55e7a6192203815bacf1ff9f1f7736fed07