Import translations. DO NOT MERGE am: 3860bee3d0  -s ours
am: 3024df7772  -s ours

Change-Id: I1b055f0d21b0b200a052bf0f6b98979b7d9f0079