Import translations. DO NOT MERGE am: 36c5d92e56  -s ours am: d999061774  -s ours am: 0d94b34ada  -s ours
am: 3b1f24900d  -s ours

Change-Id: Icefaa232da158cfac4a35411540fa5af9da11cac