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

Change-Id: I679e71425e17c60c42cb8b9edf9403b8ba95275d