Import translations. DO NOT MERGE am: b2d808b3f3  -s ours
am: 83660c7a66  -s ours

Change-Id: Ie22bf56eee0af18b8640fff5a8770ef08ced92df