Import translations. DO NOT MERGE am: f8e5c53706  -s ours
am: f19efe9fd5  -s ours

Change-Id: I71e3e7a5558dbccb45fa332973994cf154008e5b