Import translations. DO NOT MERGE am: 83b18efa96  -s ours
am: c2860718a4  -s ours

Change-Id: Iff606c9f084642f15a79c7e56759d03bf7cee6bb