Import translations. DO NOT MERGE am: 7ceb89eb02  -s ours am: e30316b30c  -s ours
am: 5dbe7c4bac  -s ours

Change-Id: If2ef2e7b948b4547b0fba2fc4806386bb8a1c63f