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

Change-Id: I0a73ec70261da784f3b2b17dc68e9eb8df1cf78a