Import translations. DO NOT MERGE am: 7fea90bfec  -s ours
am: ed0063eede  -s ours

Change-Id: Icb8e1c20eac3a1bf91c35443cac0eb638bd6a607