Import translations. DO NOT MERGE am: 36c5d92e56  -s ours
am: d999061774  -s ours

Change-Id: I1f75bb94eb1f6c828fb65a5309274b818b2d8902