Import translations. DO NOT MERGE am: ab3feb2c95  -s ours am: 505a717a4b  -s ours
am: a4314f27bc  -s ours

Change-Id: I3aeeae85e5b1cb19af713501b5e59cea1e4fd466