Import translations. DO NOT MERGE am: 8a18ea0a1d  -s ours
am: c5a329d7cf  -s ours

Change-Id: Icf7ae04a65dab7029e1e2c4a140cb9b92f7cc71e