Import translations. DO NOT MERGE am: 717de1098c  -s ours am: d171aaeb20  -s ours
am: 14dba131cc  -s ours

Change-Id: Iee414c6cd8d38bb51757f03f7536f900a94f4e12