Import translations. DO NOT MERGE am: 533e2a4716  -s ours
am: e05c6051dd  -s ours

Change-Id: Icbc151b08a02dfdfca253d65f6c0ff2f349f984b